New server structure

+ little bug fixes
+ layout tweaks