added css styling
merged user interface branch