Added Buttons and their functionality and fixed display