ALmost final restyle