(Desktop)
Added some comments and improved the layout and added more settings into settings.java
Merge origin/master