Cleaup UI indicators
Cleanup layout and make fadeIn/Out configurable