few smaller changes to improve layout