Removed sizeToFit functionality, fixed some other bugs