rearranging layout and adding screenshots