visual improvments and bug fixes