Fixing left offset bug and getting rid of hard-coded height