Making progress on styling and bug fixing