Added icons and UI alignments