Added button icons and all the various screens