Better building graphic + fixes