Tidied up design to be more responsive