New type of button, style updates and major bug fixed