Little cleanup and layout optimazation
User admin interface not finished