Added indicator
Improved the layout for handheld devices