More refactorings
Added button style on launcher