Implementing settings & fixing resize bug

This time without merge conflicts!?

Looks like i can't create a branch "from master" on desktop?