Project cleanup
Fixed improper buttons display in Firefox