Multiple little changes
Merge branch 'master' of https://github.com/Petja/PetjaUI

Conflicts:
	main.css