Fixed logic, styling