merging
major UI changes and minor bug fixing
added new files