Added sticky button; cleanup