Minor improvements

Some cleanup and improvements.
Next step is to write the existing <select> into custom ones with
Material design.