Layout fixes

Modified layout to allow for channel switching.