Tried removing some "magic numbers" in positioning elements