fixes in layout & loading animation