added ui base classes, better ui layout