Add arrow button and fix layout issues