General refactoring
Introduced proper layouts to counteract applet shifting