Fixed GUI layout issues, small updates for ios7