major changes to layout, better utilization of space now. also, minor refactoring