nudging the conditions layer by 1px

also, making lots of code org changes to combine with Lepinski Coding Style™