Few changes, still something to fix, not working in big screens