Top bar  and buttons modifications