Added markup to GUI elements where necessary