fix buttons and add navbar