Started rewriting classic layout/styling