Added units
Bug Fixes oh my
Working on layout ideas