final fixes, removing unnecessary, positioning loader