Updated style. Close to ready