Fixing bugs, make design more responsive