Improved error handling
Begin restructuring of client page