small changes and removal of icons for now