A few nit changes
Added button separator