Bit of code reorganisation
Code cleanup.
Proper dispose of graphics inside layout builders.