Code cleanup
Added Raised Button