Few more tweaks. Need to get the horizontal view looking good, also need
to fix the toggle button.