some clean ups and updated layout