More changes to the UI

icons and moving from activities