changed icons and layout, but still need fixing