Please raise it as an issue. My UI knowledge is pretty limited but will try to make it a bit cleaner.