Look & feel updated