Tweaks to top menu.

Signed-off-by: Ben Corlett <bencorlett@me.com>
Abstract panels and blocks out.

Signed-off-by: Ben Corlett <bencorlett@me.com>