fixed icons and began rearranging layout