Added new styling - Basic structure almost complete