Additional Functionality added
Fixed sizing issues with labels and buttons