Made the UI even more sexier