simplified top button
optimization tweaks