Fixing Some things, about to add scrolling back in.