added some formatting and button controls