UI modifications

Moving more to HTML\CSS