Added buttonbar to mark-up and adjusted styling
Fixed positioning issues