Fix settings bugs, change design
Update version code