Changed Square to Activated; Added Border