First Pull Request

Merging UI code