Move buttons to the right side, improve navigation