Fix loading indicator placement, remove excess padding workaroudn everywhere it's used