Client: 1. Fixed margin problem
Client: 1. fixed toolbar resizing problem.
Client: 1. remove debug file
2. need testing on windows