clean up frames and use divs where appropriate