(srampui-84) Proper use of buttons and anchors

Made sure buttons and anchors are used appropriately.