Fixed some math/ correct layering for graphics