added enhancements and small screens support for wc