Minor changes and bug fixes. UI working. Need to make it pretty and to get logic done