Added top toolbar and migrated some stuff from bottom to top.