Added icons and changed layouts