Fix/phantom buttons and tweak filter layout