stupid commit to try to stop locking problems
* moves some stuff about and changed some layout code