More work on GUI Mockup.psd