cleaned viewer, used a gridlayout, added controls