little adjustments, about to further tidy misc UI elements