Fixed layout (a bit) and added few stub methods