Fixed a couple of bugs and added a calculated width