Fixes and look modifications