Desing update, trying to go more responsive desing