Performance and UI optimiziations