Ready to refactor and make it responsive