More CSS work, using calc now for more intelligent layouting