Server working as it should

+ Small fixes on the layout