Layout modifications, testing with rst formatting...