Refactored a little, added layout concern, modified readme