Fix button, refactor, add header/extends stylesheets