Smaller icon size for entry types in smaller screen width
Improved order in controllers code, to make them more readable.