Added addtional layouts. UI tweaks.