Optimized code and updated look