small style corrections, and use a metro button instead of link