Added button navigation with icons