Added enlarge view, fixes and