Adding loading features and layout fixies