layout and styles changes still wip though